summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* version.sh: add preprocessing guardsTimothy Gu2013-11-30
* version.sh: add a little usage commentTimothy Gu2013-11-30
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-11-30
|\
| * dcadec: Add some logging before returning on errorTim Walker2013-11-30
* | Merge commit 'f058f384a0d76bfd125f4738dceab7c890186432'Michael Niedermayer2013-11-30
|\|
| * configure: Do not use pthread_create to check for pthreadLuca Barbato2013-11-30
* | avcodec/mpeg4video: fix doxycomments so they are not associated with random u...Michael Niedermayer2013-11-30
* | Merge remote-tracking branch 'cigaes/master'Michael Niedermayer2013-11-30
|\ \
| * | lavc/srtenc: use bprint for text buffers.Nicolas George2013-11-30
* | | version.sh: make it independant of version.h file nameTimothy Gu2013-11-30
* | | doc/ffserver: clarify documentation for Feed MaxFileSize optionStefano Sabatini2013-11-30
* | | doc/ffserver: clarify that note in NoDaemon option documentationStefano Sabatini2013-11-30
* | | ffserver: print error code description in case of write_header() failureStefano Sabatini2013-11-30
* | | doc/ffserver: add "Detailed description" chapterStefano Sabatini2013-11-30
* | | doc/ffserver: remove more mentions to LAME and buildStefano Sabatini2013-11-30
|/ /
* | lavfi/Makefile: Don't compile lavfutils.c and lswsutils.c if they are not neededJames Almer2013-11-30
* | Merge remote-tracking branch 'cus/stable'Michael Niedermayer2013-11-30
|\ \
| * | ffmpeg: ensure that -fix_sub_duration doesnt create subtitles with zero durationMarton Balint2013-11-28
| * | ffmpeg: free empty subtitles as well in transcode_subtitlesMarton Balint2013-11-28
| * | ffmpeg: do not pass possibly undefined subtitles to sub2video_updateMarton Balint2013-11-28
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-11-30
|\ \ \ | | |/ | |/|
| * | go2meeting: disallow tile dimensions that are not multiple of 16Kostya Shishkov2013-11-29
* | | Merge commit 'e026ee0446de27fc38e33e98704fada012fdc763'Michael Niedermayer2013-11-30
|\| |
| * | mpeg4videodec: move sprite_{shift,traj} from MpegEncContext to Mpeg4DecContextAnton Khirnov2013-11-29
* | | Merge commit '513d849bb605d3d862da1ada709bd2ca1ac68f58'Michael Niedermayer2013-11-30
|\| |
| * | mpeg4videodec: move num_sprite_warping_points from MpegEncContext to Mpeg4Dec...Anton Khirnov2013-11-29
* | | Merge commit '9ba3fc3e3d12c9ef00dcb0222b7ea0ccb5c4a091'Michael Niedermayer2013-11-30
|\| |
| * | mpeg4videodec: move sprite_brightness_change from MpegEncContext to Mpeg4DecC...Anton Khirnov2013-11-29
* | | Merge commit '58c120a9290eef057dbf26761a4f89b7f67bbde1'Michael Niedermayer2013-11-30
|\| |
| * | mpeg4videodec: move scalability from MpegEncContext to Mpeg4DecContextAnton Khirnov2013-11-29
* | | Merge commit '6e81597d5a89f64dfab5c7e99e46b4355139e324'Michael Niedermayer2013-11-30
|\| |
| * | mpeg4videodec: move enhancement_type from MpegEncContext to Mpeg4DecContextAnton Khirnov2013-11-29
* | | Merge commit '2992afda83a7d5c0a9ec45bdce76d8abbe0961c5'Michael Niedermayer2013-11-30
|\| |
| * | mpeg4videodec: remove a write-only variable from MpegEncContextAnton Khirnov2013-11-29
* | | Merge commit '3b1c0f686d5a162ceb5048910a7ce0bf7ed3a1ab'Michael Niedermayer2013-11-30
|\| |
| * | mpeg4videodec: move new_pred from MpegEncContext to Mpeg4DecContextAnton Khirnov2013-11-29
* | | Merge commit 'e89247debd5276d57ce4a26516224204f9541af0'Michael Niedermayer2013-11-30
|\| |
| * | mpeg4videodec: replace MpegEncContext.reduced_res_vop with a local variableAnton Khirnov2013-11-29
* | | Merge commit '8cebc9eaac8631adb23dd1e46c37ad8474139a07'Michael Niedermayer2013-11-30
|\| |
| * | mpeg4videodec: remove a write-only variable from MpegEncContextAnton Khirnov2013-11-29
* | | Merge commit 'b1aacd56685cd131f517e0551834a0bbd3f5f809'Michael Niedermayer2013-11-30
|\| |
| * | mpeg4videodec: move t_frame from MpegEncContext to Mpeg4DecContextAnton Khirnov2013-11-29
* | | mpeg4_update_thread_context: copy the whole mpeg4 specific context instead of...Michael Niedermayer2013-11-30
* | | Merge commit '038890740014dc33d2e2f04da7cf0a9da821264e'Michael Niedermayer2013-11-30
|\| |
| * | mpeg4videodec: move cplx_estimation_* fields from MpegEncContext to Mpeg4DecC...Anton Khirnov2013-11-29
* | | avcodec/mpeg4videodec: update bug workaround related variables like they wher...Michael Niedermayer2013-11-30
* | | Merge commit '43af264de8606668c6b2fa7f96c946bdc3dbe072'Michael Niedermayer2013-11-30
|\| |
| * | mpeg4videodec: move mpeg4-specific bug workaround variables from MpegEncConte...Anton Khirnov2013-11-29
* | | Merge commit 'e2ceb17642f374a7df8f1f5d3d2b2446525bc7fb'Michael Niedermayer2013-11-30
|\| |
| * | mpeg4videodec: move mpeg4-specific post-frame-decode code from h264dec to mpe...Anton Khirnov2013-11-29