Skip to content
Commits on Nov 30, 2013
  1. ffplay: add opengl support

    Signed-off-by: Marton Balint <cus@passwd.hu>
    committed Feb 3, 2013
  2. ffplay: seperate display output functions to ffplay_xv.c

    Signed-off-by: Marton Balint <cus@passwd.hu>
    committed Feb 2, 2013
  3. @saste
  4. @saste
  5. @saste
  6. @saste

    doc/ffserver: add "Detailed description" chapter

    Also move FFM section up in the file, and rename it.
    saste committed Nov 29, 2013
  7. @saste
  8. @jamrial @michaelni

    lavfi/Makefile: Don't compile lavfutils.c and lswsutils.c if they are…

    … not needed
    
    They are only needed by removelogo.
    This fixes a link failure in shared builds when compiling with
    removelogo disabled but Lavf/SwS enabled
    
    Signed-off-by: James Almer <jamrial@gmail.com>
    Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
    jamrial committed with michaelni Nov 29, 2013
  9. @michaelni

    Merge remote-tracking branch 'cus/stable'

    * cus/stable:
      ffmpeg: ensure that -fix_sub_duration doesnt create subtitles with zero duration
      ffmpeg: free empty subtitles as well in transcode_subtitles
      ffmpeg: do not pass possibly undefined subtitles to sub2video_update
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
    michaelni committed Nov 30, 2013
  10. @michaelni

    Merge remote-tracking branch 'qatar/master'

    * qatar/master:
      go2meeting: disallow tile dimensions that are not multiple of 16
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
    michaelni committed Nov 30, 2013
  11. @michaelni

    Merge commit 'e026ee0446de27fc38e33e98704fada012fdc763'

    * commit 'e026ee0446de27fc38e33e98704fada012fdc763':
      mpeg4videodec: move sprite_{shift,traj} from MpegEncContext to Mpeg4DecContext
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
    michaelni committed Nov 30, 2013
  12. @michaelni

    Merge commit '513d849bb605d3d862da1ada709bd2ca1ac68f58'

    * commit '513d849bb605d3d862da1ada709bd2ca1ac68f58':
      mpeg4videodec: move num_sprite_warping_points from MpegEncContext to Mpeg4DecContext
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
    michaelni committed Nov 30, 2013
  13. @michaelni

    Merge commit '9ba3fc3e3d12c9ef00dcb0222b7ea0ccb5c4a091'

    * commit '9ba3fc3e3d12c9ef00dcb0222b7ea0ccb5c4a091':
      mpeg4videodec: move sprite_brightness_change from MpegEncContext to Mpeg4DecContext
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
    michaelni committed Nov 30, 2013
  14. @michaelni

    Merge commit '58c120a9290eef057dbf26761a4f89b7f67bbde1'

    * commit '58c120a9290eef057dbf26761a4f89b7f67bbde1':
      mpeg4videodec: move scalability from MpegEncContext to Mpeg4DecContext
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
    michaelni committed Nov 30, 2013
  15. @michaelni

    Merge commit '6e81597d5a89f64dfab5c7e99e46b4355139e324'

    * commit '6e81597d5a89f64dfab5c7e99e46b4355139e324':
      mpeg4videodec: move enhancement_type from MpegEncContext to Mpeg4DecContext
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
    michaelni committed Nov 30, 2013
  16. @michaelni

    Merge commit '2992afda83a7d5c0a9ec45bdce76d8abbe0961c5'

    * commit '2992afda83a7d5c0a9ec45bdce76d8abbe0961c5':
      mpeg4videodec: remove a write-only variable from MpegEncContext
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
    michaelni committed Nov 30, 2013
  17. @michaelni

    Merge commit '3b1c0f686d5a162ceb5048910a7ce0bf7ed3a1ab'

    * commit '3b1c0f686d5a162ceb5048910a7ce0bf7ed3a1ab':
      mpeg4videodec: move new_pred from MpegEncContext to Mpeg4DecContext
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
    michaelni committed Nov 30, 2013
  18. @michaelni

    Merge commit 'e89247debd5276d57ce4a26516224204f9541af0'

    * commit 'e89247debd5276d57ce4a26516224204f9541af0':
      mpeg4videodec: replace MpegEncContext.reduced_res_vop with a local variable
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
    michaelni committed Nov 30, 2013
  19. @michaelni

    Merge commit '8cebc9eaac8631adb23dd1e46c37ad8474139a07'

    * commit '8cebc9eaac8631adb23dd1e46c37ad8474139a07':
      mpeg4videodec: remove a write-only variable from MpegEncContext
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
    michaelni committed Nov 30, 2013
  20. @michaelni

    Merge commit 'b1aacd56685cd131f517e0551834a0bbd3f5f809'

    * commit 'b1aacd56685cd131f517e0551834a0bbd3f5f809':
      mpeg4videodec: move t_frame from MpegEncContext to Mpeg4DecContext
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
    michaelni committed Nov 30, 2013
  21. @michaelni

    mpeg4_update_thread_context: copy the whole mpeg4 specific context in…

    …stead of variables one by one
    
    This simplifies the code
    
    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
    michaelni committed Nov 30, 2013
  22. @michaelni

    Merge commit '038890740014dc33d2e2f04da7cf0a9da821264e'

    * commit '038890740014dc33d2e2f04da7cf0a9da821264e':
      mpeg4videodec: move cplx_estimation_* fields from MpegEncContext to Mpeg4DecContext
    
    Conflicts:
    	libavcodec/mpeg4videodec.c
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
    michaelni committed Nov 30, 2013
  23. @michaelni

    avcodec/mpeg4videodec: update bug workaround related variables like t…

    …hey where before
    
    This fixes the code after the variables have been moved into the
    mpeg4 decoder.
    
    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
    michaelni committed Nov 30, 2013
  24. @michaelni

    Merge commit '43af264de8606668c6b2fa7f96c946bdc3dbe072'

    * commit '43af264de8606668c6b2fa7f96c946bdc3dbe072':
      mpeg4videodec: move mpeg4-specific bug workaround variables from MpegEncContext to Mpeg4DecContext
    
    Conflicts:
    	libavcodec/mpeg4videodec.c
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
    michaelni committed Nov 30, 2013
  25. @michaelni

    Merge commit 'e2ceb17642f374a7df8f1f5d3d2b2446525bc7fb'

    * commit 'e2ceb17642f374a7df8f1f5d3d2b2446525bc7fb':
      mpeg4videodec: move mpeg4-specific post-frame-decode code from h264dec to mpeg4videodec
    
    Conflicts:
    	libavcodec/h263dec.c
    	libavcodec/mpeg4video.h
    	libavcodec/mpeg4videodec.c
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
    michaelni committed Nov 30, 2013
  26. @michaelni

    avcodec/h263dec: move call to ff_mpeg4_workaround_bugs() under codec_…

    …id check
    
    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
    michaelni committed Nov 30, 2013
  27. @michaelni

    Merge commit 'b452d5ae866942cec00aa1432fe29498b38b49fc'

    * commit 'b452d5ae866942cec00aa1432fe29498b38b49fc':
      mpeg4videodec: move mpeg4-specific bug detection from h263 generic code to mpeg4
    
    Conflicts:
    	libavcodec/h263dec.c
    
    not merged, the header decode function is not the right place
    See: 6c9b82b
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
    michaelni committed Nov 30, 2013
  28. @michaelni

    avcodec/mpeg4videodec: move bug workaround code into seperate function

    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
    michaelni committed Nov 30, 2013
  29. @michaelni

    Merge commit '48e139409556861c9e561ce34133891d8eecc3cf'

    * commit '48e139409556861c9e561ce34133891d8eecc3cf':
      mpeg4videodec: move MpegEncContext.resync_marker into Mpeg4DecContext.
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
    michaelni committed Nov 30, 2013
Commits on Nov 29, 2013
  1. @michaelni

    h263: remove unused ff_h263_find_resync_marker()

    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
    michaelni committed Nov 30, 2013
  2. @michaelni

    Merge commit 'c2f7417eeb9cc31f75e71f7be2780f90f1628d7e'

    * commit 'c2f7417eeb9cc31f75e71f7be2780f90f1628d7e':
      vc1: move MpegEncContext.resync_marker into VC1Context.
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
    michaelni committed Nov 30, 2013
  3. @michaelni

    Merge commit 'a5a71992cae34b321ceb8374f44ce17a945a3881'

    * commit 'a5a71992cae34b321ceb8374f44ce17a945a3881':
      mpeg4videoenc: don't set MpegEncContext.resync_marker
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
    michaelni committed Nov 29, 2013
  4. @michaelni

    Merge commit 'ad09f52586eae4c5473c3a6a803d73e1ba56c0eb'

    * commit 'ad09f52586eae4c5473c3a6a803d73e1ba56c0eb':
      h263dec: remove commented out cruft
    
    Conflicts:
    	libavcodec/h263dec.c
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
    michaelni committed Nov 29, 2013
  5. @michaelni

    avcodec/mpeg4videodec: copy rvlc in mpeg4_update_thread_context too

    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
    michaelni committed Nov 29, 2013
  6. @michaelni

    Merge commit 'bc5abfb19e7ff00b859120561d6ffd622c7904fe'

    * commit 'bc5abfb19e7ff00b859120561d6ffd622c7904fe':
      mpeg4videodec: move MpegEncContext.rvlc to Mpeg4DecContext
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
    michaelni committed Nov 29, 2013
Something went wrong with that request. Please try again.